win32: Call windowing init from display_class_init()

This follows the same reasoning as the X11 backend in commit
0122a9da8eab518652553aa4e777d5caf18a6163

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 5d9cb14c600082cd00ab71f1769c18e46fbe966c..6d17ace8c31ced0d7c4f0b1b720185e2f1b5097d 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -688,4 +688,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
   display_class->convert_selection = _gdk_win32_display_convert_selection;
   display_class->text_property_to_utf8_list = _gdk_win32_display_text_property_to_utf8_list;
   display_class->utf8_to_string_target = _gdk_win32_display_utf8_to_string_target;
+  
+  _gdk_win32_windowing_init ();
 }

diff --git a/gdk/win32/gdkdisplaymanager-win32.c b/gdk/win32/gdkdisplaymanager-win32.c
index 0e5f71168cb16092a455d0ae8c0d09c4ae5a17dd..9d1e234ce5aa7fcf10c9724cdedf10fd6becfbb2 100644 (file)
--- a/gdk/win32/gdkdisplaymanager-win32.c
+++ b/gdk/win32/gdkdisplaymanager-win32.c
@@ -41,14 +41,6 @@ G_DEFINE_TYPE (GdkWin32DisplayManager, gdk_win32_display_manager, GDK_TYPE_DISPL
 static void
 gdk_win32_display_manager_init (GdkWin32DisplayManager *manager)
 {
-  static once = TRUE;
-  /* relies on displaymanager being a singleton , but our init functions
-   * call gtk_diplay_maanger_get() again */
-  if (once)
-    {
-      once = FALSE;
-      _gdk_win32_windowing_init ();
-    }
 }
 
 static void